Skip to content

[UPMERGE] 1.7 -> 2.0#411

Merged
NoResponseMate merged 11 commits into2.0from
upmerge/1.7_2.0
Jan 2, 2026
Merged

[UPMERGE] 1.7 -> 2.0#411
NoResponseMate merged 11 commits into2.0from
upmerge/1.7_2.0

Conversation

@SyliusBot
Copy link

This PR has been generated automatically.
For more details see upmerge_pr.yaml.

Remember! The upmerge should always be merged with using Merge pull request button.

In case of conflicts, please resolve them manually with usign the following commands:

git fetch upstream
gh pr checkout <this-pr-number>
git merge upstream/2.0 -m "Resolve conflicts between 1.7 and 2.0"

If you use other name for the upstream remote, please replace upstream with the name of your remote pointing to the Sylius/PayPalPlugin repository.

Once the conflicts are resolved, please run git merge --continue and push the changes to this PR.

NoResponseMate and others added 4 commits October 23, 2025 15:25
| Q               | A
| --------------- | -----
| Branch?         | 1.7
| Bug fix?        | yes
| New feature?    | no
| Related tickets | -
| Q               | A
| --------------- | -----
| Branch?         | 1.7
| Bug fix?        | kinda
| New feature?    | no
| Related tickets | -
Copy link

@chatgpt-codex-connector chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

kevin-blackbird and others added 4 commits December 18, 2025 09:32
Hello,

On the version 1.7.6 for Sylius 1 there is a little error on DI for
service `sylius.paypal.client.sftp`, the class is `phpseclib\Net\SFTP`
but the `Sylius\PayPalPlugin\Downloader\SftpPayoutsReportDownloader` use
`phpseclib3\Net\SFTP`

This cause the error on report download :
```
Attempted to load class "SFTP" from namespace "phpseclib\Net".
Did you forget a "use" statement for "phpseclib3\Net\SFTP"? 
``` 
Kind regards,
Kévin
| Q               | A
| --------------- | -----
| Branch?         | 1.7
| Bug fix?        | kinda
| New feature?    | no
| Related tickets | related #414

Should catch these kinds of issues early.
@NoResponseMate NoResponseMate merged commit 8771e75 into 2.0 Jan 2, 2026
19 checks passed
@NoResponseMate NoResponseMate deleted the upmerge/1.7_2.0 branch January 2, 2026 13:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants